dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
558480e
6f6b786
)
Merge "Revert "AJAXify watchlist editor""
author
Krinkle
<ttijhof@wikimedia.org>
Wed, 1 Aug 2012 03:19:28 +0000
(
03:19
+0000)
committer
Gerrit Code Review
<gerrit@wikimedia.org>
Wed, 1 Aug 2012 03:19:28 +0000
(
03:19
+0000)
1
2
includes/api/ApiWatch.php
patch
|
diff1
|
diff2
|
blob
|
history
includes/specials/SpecialEditWatchlist.php
patch
|
diff1
|
diff2
|
blob
|
history
languages/messages/MessagesEn.php
patch
|
diff1
|
diff2
|
blob
|
history
languages/messages/MessagesQqq.php
patch
|
diff1
|
diff2
|
blob
|
history
maintenance/language/messages.inc
patch
|
diff1
|
diff2
|
blob
|
history
resources/Resources.php
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
includes/api/ApiWatch.php
index
f307f9a
,
c923c6d
..
0509f1f
---
1
/
includes/api/ApiWatch.php
---
2
/
includes/api/ApiWatch.php
+++ b/
includes/api/ApiWatch.php
@@@
-98,16
-85,10
+85,13
@@@
class ApiWatch extends ApiBase
return array(
'title' => array(
ApiBase::PARAM_TYPE => 'string',
- ),
- 'titles' => array(
- ApiBase::PARAM_TYPE => 'string',
- ApiBase::PARAM_ISMULTI => true
+ ApiBase::PARAM_REQUIRED => true
),
'unwatch' => false,
- 'token' => null,
+ 'token' => array(
+ ApiBase::PARAM_TYPE => 'string',
+ ApiBase::PARAM_REQUIRED => true
+ ),
);
}
diff --cc
includes/specials/SpecialEditWatchlist.php
Simple merge
diff --cc
languages/messages/MessagesEn.php
Simple merge
diff --cc
languages/messages/MessagesQqq.php
Simple merge
diff --cc
maintenance/language/messages.inc
Simple merge
diff --cc
resources/Resources.php
Simple merge